merge trunk
authorKenichi Handa <handa@etlken>
Wed, 30 Jun 2010 06:51:39 +0000 (15:51 +0900)
committerKenichi Handa <handa@etlken>
Wed, 30 Jun 2010 06:51:39 +0000 (15:51 +0900)
commit2a35ee837361f58c23936308fdd5af64b8b6a810
tree92cc75d947ab7523f712f79664b8d4e26096d88c
parent373c0cfc0ecaf45384c9c940fa233d8ce84fd98a
parentc057bd4580527231d5404d2d9511b9b6c4137061
merge trunk